Signed-off-by: Alina Gotovtseva <[email protected]>
Co-authored-by: zachlewis <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

* Add VFX 2024 ASWF iamges to CI

Signed-off-by: Rémi Achard <[email protected]>

* Bump CMake to 3.14 minimum to fix warning in FetchContent

Signed-off-by: Rémi Achard <[email protected]>

* Fix error message formating

Signed-off-by: Rémi Achard <[email protected]>

* Reduce warnings

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

* Python 3.13 wheels

Signed-off-by: Rémi Achard <[email protected]>

* Build mac ARM wheels on Apple Silicon runners to enable testing

Signed-off-by: Rémi Achard <[email protected]>

* Fix upload_pypi job dependencies

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

* ACES2 BuiltinTransforms

Signed-off-by: Rémi Achard <[email protected]>

* Fix NaNs and add bound checking on CPU gamut table sampling

Signed-off-by: Rémi Achard <[email protected]>

* Use powf instead of pow for consistency

Signed-off-by: Rémi Achard <[email protected]>

* Remove f suffix for floating-point literals in shaders

Signed-off-by: Rémi Achard <[email protected]>

* Address PR feedback around unit tests

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…cademySoftwareFoundation#2051)

* Add DCDM displays, improve Rec.2100 surround

Signed-off-by: Doug Walker <[email protected]>

* Fix Linux test

Signed-off-by: Doug Walker <[email protected]>

* Remove 48 nit scaling

Signed-off-by: Doug Walker <[email protected]>

* Remove D60 DCDM built-ins

Signed-off-by: Doug Walker <[email protected]>

* Add version check

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…cademySoftwareFoundation#1992 (LUT-free builtins) (AcademySoftwareFoundation#2029)

* Adsk Contrib - Issues AcademySoftwareFoundation#1968 (mirrored builtins) and AcademySoftwareFoundation#1992 (LUT-free builtins Pt.1)

For issue AcademySoftwareFoundation#1992 - "Make LUT-free implementations of certain built-in transforms"
- Adding fixed-functions PQ_TO_LINEAR and LINEAR_TO_PQ. These will be used to handle following built-in transforms if the LUT support is turned off:
-- CURVE - ST-2084_to_LINEAR
-- CURVE - LINEAR_to_ST-2084
-- DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ
-- DISPLAY - CIE-XYZ-D65_to_ST2084-P3-D65
- Implemented CPU renderers for scalar, SSE2 (with fastPower) and SSE2 (with Intel SVML) intrinsics targets for the new fixed-function.
- Implemented GPU shader generator for the new fixed-function
- Remaining fixed-functions will be implemented in an upcoming PR.

For issue AcademySoftwareFoundation#1968 - "Make display EOTFs in built-in transforms mirrored and unclamped to preserve sub-black and super-white"
- Existing LUT-based HLG curve is now unclamped at both ends and mirrored around origin.
- Both the existing LUT-based and the new LUT-free implementations of the PQ curve are now unclamped at both ends and mirrored around origin.

Aux Changes
- GetFixedFunctionCPURenderer() now takes a new bool parameter fastLogExpPow.
- Added a stand-in OCIO_LUT_SUPPORT preprocessor macro in preparation for ocio-lite where the lut support can be turned off.
- Added util functions to Config_tests.cpp to help creating configs with arbitrary version.
- Added ability to test fixed-function cpu renderers with and without fastLogExpPow.
- Added capability to specify custom extended ranges in the GPU unit tests. Default value is [-1.0,2.0] same as the previously hard-coded range.
- Fixed a bug in the GPU unit tests where the computed domain values would overshoot.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Renderer_PQ_TO_LINEAR_SSE high precision implementation is now limited to MSVC 2019+ compiler as it has the built-in intel _mm_pow_ps() SVML implementation.
- LUT-based PQ to Linear implementation now uses half-domain LUT to handle extended range. Linear to PQ direction was alredy using half-domain lut (probably due to normal input range being 0 to 100.
- BT_2100 namespace is renamed to HLG
- In BuiltinTransform_tests it's now possible (and necessary) to specify the error threshold for each built-in transform. This was needed as the hard-coded 1e-6 threshold was too tight for the PQ curve which uses nested power functions and thus numerical stability was depending on the implantation flavor.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Reversing the forward direction of the PQ curve, now the forward direction is linear -> PQ . Changed the enum names accordinly, updated the tests etc.
- Adding a new Hybrid Log Gamma fixed function. Similar to the PQ curve, the forward direction is linear -> HLG. SIMD implementation is currently missing, can be done in the future.
- minor fixes in the PQ cpu op
- some adjustments to the CPU test values and thresholds.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Ah! gcc and clang being more picky about the unused variable bit me again.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Completed outstanding to-do items.
- Code beautification.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Adding few missing pieces I noticed for PQ and HLG fixed functions
- Since we changed the default direction of the PQ and HLG fixed functions, I moved the order of the functions in the source files so that forward becomes before inverse.
- Adding the first cut of the FIXED_FUNCTION_LINEAR_TO_DOUBLE_LOG_AFFINE fixed function. This is still in WIP, needs some optimizations and tests implemented. Also to be able to handle the Apple Camera curve, it needs to be extended a bit. But currently it can handle the Canon CLog2 and CLog3 curves with all tests passing.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - unbreak gcc and clang compilers

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Adding GpuShaderText::floatXGreaterThanEqual() functions which are needed for precise break-point handling in non-continuous piecewise functions.
- changes for double log gamma fixed function
-- Fixed couple of bugs
-- Added basic parameter validation
-- implemented fwd and inv gpu shaders
-- Fixed CLog2 and CLog3 double log gamma constants.
-- implemented cpu and gpu shaders

Signed-off-by: cuneyt.ozdas <[email protected]>

* - HLG fixed-function is now parametrized and the previously hard-coded Rec.2100 HLG curve parameters are now passed to the fixed-function by the built-in transforms and by some of the test suites.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Adding a new parameter to the HLG fixed-function to control the point mirroring is applied. Below the mirror point the input values will be mirrored around that point and the output sign will be flipped. Although this does not guarantee by itself a monotonously increasing (thus invertible) and a continuous function, when the parameters are proper these properties will be achieved.
- Both the Rec.2100 HLG curve and Apple camera curve are now implemented by the HLG fixed-function when the LUT-support is turned off.

for now checking-in with LUT_SUPPORT turned off to run the CI tests on the implementation. I'll turn it on later.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Unlike msvc, gcc and clang could not auto-determine the template parameter for the base class. I'm making it explicit, hope that it'll unbreak the builds.
- minor comment fix :)

Signed-off-by: cuneyt.ozdas <[email protected]>

* - gcc and clang are still failing. Removing the template for the HLG, hope this will un-confuse the compilers.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - handling the unused variable warning/error when the LUT-support is turned off.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - Fighting with more unused variable warning turned into error. At this stage I'm not sure that turning this warning on the compilers is a good idea or not. Almost all cases are simple unused variabled due to different cmake switches and will be happily optimized out by the compiler without any side-effect. I'm curious to see if that compiler flag helped anyone to catch a bug early on at all.

Signed-off-by: cuneyt.ozdas <[email protected]>

* silencing more unused vars.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - now that all the compiler are happy when the lut-support is turned off, turning it back on.

Signed-off-by: cuneyt.ozdas <[email protected]>

* - minor fixes, mostly formatting.

Signed-off-by: cuneyt.ozdas <[email protected]>

* Refine enums

Signed-off-by: Doug Walker <[email protected]>

* Add opdata test

Signed-off-by: Doug Walker <[email protected]>

* Add hlg oetf builtin

Signed-off-by: Doug Walker <[email protected]>

* Update CTF version

Signed-off-by: Doug Walker <[email protected]>

* Add builtin version tests

Signed-off-by: Doug Walker <[email protected]>

* Fix typo

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: cuneyt.ozdas <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…twareFoundation#1999) (AcademySoftwareFoundation#2039)

* For issue AcademySoftwareFoundation#1999 adding the new cg and studio configs.
- Added new configs cg-config-v2.2.0_aces-v1.3_ocio-v2.4.ocio and studio-config-v2.2.0_aces-v1.3_ocio-v2.4.ocio
- Made default config cg-config-v2.2.0_aces-v1.3_ocio-v2.4
- Updated the tests accordingly.

TODO: Some documents such as aces_cg.rst and aces_studio.srt need to be updated.
Signed-off-by: cuneyt.ozdas <[email protected]>

* - minor white-space fixes.

Signed-off-by: cuneyt.ozdas <[email protected]>

* renaming P3 display scene referred aliases:

-- lin_displayp3_scene --> lin_p3d65_scene
-- srgb_displayp3_scene --> srgb_p3d65_scene

Signed-off-by: cuneyt.ozdas <[email protected]>

* Make CIE-XYZ Scene-referred inactive

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: cuneyt.ozdas <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

* Fix platform latest

Signed-off-by: Rémi Achard <[email protected]>

* Fix Windows Python 3.7 CI

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: zachlewis <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…SoftwareFoundation#2059)

* Add hasAlias method to ColorSpace and NamedTransform classes

Signed-off-by: annie <[email protected]>

* minor style changes

Signed-off-by: annie <[email protected]>

* Update Python binding to include hasAlias method with unit tests

Signed-off-by: annie <[email protected]>

---------

Signed-off-by: annie <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

* Update usage_examples.rst

Changed Displaying an image, using the GPU (Full Viewport Pipeline) to CPU, added Python section and added Displaying an image, using the GPU with C++ example.

Signed-off-by: shaneantrim <[email protected]>

* removed main() call

Signed-off-by: shaneantrim <[email protected]>

* Removed Legacy C++ section

Signed-off-by: shaneantrim <[email protected]>

---------

Signed-off-by: shaneantrim <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…oundation#2060)

* Update documentation for 2.4 release

Signed-off-by: Doug Walker <[email protected]>

* Add link to prototype ACES 2 configs

Signed-off-by: Doug Walker <[email protected]>

* Update video links

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…ySoftwareFoundation#2077)

Signed-off-by: Eric Renaud-Houde <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

…reFoundation#2072)

By default Visual Studio projects do not compile source files in
parallel. Add "/MP" flag to enable that.

From scratch OCIO build on Ryzen 5950X, VS2022: 580sec -> 208sec.
Most of remaining single-threaded time is cloning external libraries
or building external libraries (most of them don't do parallel
compilation either). But within building OCIO itself, CPU usage
goes close to 100% instead of 5%.

Signed-off-by: Aras Pranckevicius <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

Instead of creating temporary LUT files for GPU tests,
read them from the testdata directory instead.
This removes the need to clean them up after each run.

Signed-off-by: Ananth Bhaskararaman <[email protected]>
Signed-off-by: Chris Nash <[email protected]>

* ocio gm in photoshop

Signed-off-by: Dave Sawyer <[email protected]>

* Update supported_apps.yml

Signed-off-by: Dave Sawyer <[email protected]>

* ps and fnordware text

Signed-off-by: Dave Sawyer <[email protected]>

---------

Signed-off-by: Dave Sawyer <[email protected]>
Signed-off-by: Chris Nash <[email protected]>